Follow up to r106037; fix location of check
authorJeroen De Dauw <jeroendedauw@users.mediawiki.org>
Tue, 13 Dec 2011 16:42:56 +0000 (16:42 +0000)
committerJeroen De Dauw <jeroendedauw@users.mediawiki.org>
Tue, 13 Dec 2011 16:42:56 +0000 (16:42 +0000)
includes/GlobalFunctions.php

index 5fdcf2a..ce60d59 100644 (file)
@@ -3460,10 +3460,10 @@ function wfDeprecated( $function, $version = false, $component = false ) {
        if ( !isset( $functionsWarned[$function] ) ) {
                $functionsWarned[$function] = true;
                
-               if ( $version && $component === false ) {
+               if ( $version ) {
                        global $wgDeprecationReleaseLimit;
                        
-                       if ( $wgDeprecationReleaseLimit ) {
+                       if ( $wgDeprecationReleaseLimit && $component === false ) {
                                # Strip -* off the end of $version so that branches can use the
                                # format #.##-branchname to avoid issues if the branch is merged into
                                # a version of MediaWiki later than what it was branched from